Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 30 Aug 2010 06:49:10 +0000 (06:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 30 Aug 2010 06:49:10 +0000 (06:49 +0000)
commit46355f6961c8591637ee854b93adf2496b9a0d60
tree2c4697dce43c7f9f828b35a0bbc011fa4609b1f1
parente9d9b740b3554e6dbbdfb6709344f6ff6d61d300
parent47a288c5643d9aecf11e357150e2475b8618ae42
Merge from mainline.